Remove internal code changes

Removes internal code changes to resolve problems.